Skip to content

feat(ConflictPicker): allow to set overwrite flag#2432

Merged
susnux merged 1 commit into
mainfrom
feat/allow-setting-overwrite
May 20, 2026
Merged

feat(ConflictPicker): allow to set overwrite flag#2432
susnux merged 1 commit into
mainfrom
feat/allow-setting-overwrite

Conversation

@susnux
Copy link
Copy Markdown
Contributor

@susnux susnux commented May 20, 2026

Some operations like MOVE will not write into folder like the upload, but will just replace one folder with another.
Basically handle files and folders the same way.

In this case we need to indicate that the whole folder is to-be-replaced.

@susnux susnux added enhancement New feature or request 3. to review labels May 20, 2026
@susnux susnux requested review from Antreesy and skjnldsv May 20, 2026 13:47
@codecov
Copy link
Copy Markdown

codecov Bot commented May 20, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 43.79%. Comparing base (4780816) to head (ad95491).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2432   +/-   ##
=======================================
  Coverage   43.79%   43.79%           
=======================================
  Files          15       15           
  Lines         427      427           
  Branches       81       81           
=======================================
  Hits          187      187           
  Misses        211      211           
  Partials       29       29           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Antreesy
Copy link
Copy Markdown
Contributor

This is to be set from an app? Do you have an example?
This is not a blocker, as don't see breaking changes here =) just to clarify

@susnux susnux force-pushed the feat/allow-setting-overwrite branch from cb6038e to baeb407 Compare May 20, 2026 13:55
@susnux
Copy link
Copy Markdown
Contributor Author

susnux commented May 20, 2026

This is to be set from an app? Do you have an example?

Yes it needs to be set in the server "move file" action.

Given:

  • a/
    • b/
      • Y
    • c.txt
  • d/
    • b/
      • X
    • e.txt

in d/ you select all files and folders and click "move" and select target a/.
Then you get promoted because of the conflict "b".
You select the new one because the text said:

When an incoming folder is selected, any conflicting files within it will also be overwritten.

But the result is:

  • a/
    • b/
      • X
    • c.txt
    • e.txt

Because move overrides the folder. The old behavior was developed for this dialog with uploads in mind which write-into folders. But WebDAV MOVE overrides.

@susnux susnux force-pushed the feat/allow-setting-overwrite branch from baeb407 to b1b8f89 Compare May 20, 2026 14:01
@susnux susnux mentioned this pull request May 20, 2026
Some operations like MOVE will not write into folder like the upload,
but will just replace one folder with another.
Basically handle files and folders the same way.

In this case we need to indicate that the whole folder is
to-be-replaced.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux susnux force-pushed the feat/allow-setting-overwrite branch from b1b8f89 to ad95491 Compare May 20, 2026 14:28
Copy link
Copy Markdown
Contributor

@Antreesy Antreesy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine then for the dialog change

@susnux susnux merged commit 8036060 into main May 20, 2026
14 of 15 checks passed
@susnux susnux deleted the feat/allow-setting-overwrite branch May 20, 2026 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants